From 6a1b85ef4e35a42a2b54456dfe7262834b33caa8 Mon Sep 17 00:00:00 2001
From: Jochen Sprickerhof <git@jochen.sprickerhof.de>
Date: Sat, 25 Jun 2022 21:45:17 +0200
Subject: [PATCH] Add workaround for failing lconvert

Closes: #1013610
---
 .../0009-Ignore-errors-during-lconvert.patch  | 26 +++++++++++++++++++
 debian/patches/series                         |  1 +
 2 files changed, 27 insertions(+)
 create mode 100644 debian/patches/0009-Ignore-errors-during-lconvert.patch

diff --git a/debian/patches/0009-Ignore-errors-during-lconvert.patch b/debian/patches/0009-Ignore-errors-during-lconvert.patch
new file mode 100644
index 000000000..8bd8f7d95
--- /dev/null
+++ b/debian/patches/0009-Ignore-errors-during-lconvert.patch
@@ -0,0 +1,26 @@
+From: Jochen Sprickerhof <git@jochen.sprickerhof.de>
+Date: Sat, 25 Jun 2022 21:22:20 +0200
+Subject: Ignore errors during lconvert
+
+Starting with qt5 5.15.4 lconvert errors with
+
+QM-Format error
+
+for some calls and thus thus fails the build.
+---
+ gui/package_app | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/gui/package_app b/gui/package_app
+index 01c00eb..f7829f6 100755
+--- a/gui/package_app
++++ b/gui/package_app
+@@ -50,7 +50,7 @@ function convert_qt_translations()
+     inputs+=("qtbase_${language}.qm")
+     if [ -e "qtdeclarative_${language}.qm" ]; then inputs+=("qtdeclarative_${language}.qm"); fi
+     if [ -e "qtserialport_${language}.qm" ]; then inputs+=("qtserialport_${language}.qm"); fi
+-    "${LCONVERT}" -o "${LANGDIR}/qt_${language}.qm" "${inputs[@]}"
++    "${LCONVERT}" -o "${LANGDIR}/qt_${language}.qm" "${inputs[@]}" || true
+ 
+     if [ "${machine}" = "Mac" ]; then
+       # Create locversion.plist in the bundle to trigger translations for
diff --git a/debian/patches/series b/debian/patches/series
index 5cd9d3bfa..233dc29fc 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,3 +6,4 @@ Disable-donation-nagging
 0007-Add-workaround-for-failing-test-on-i386.patch
 0008-Add-Debian-build-flags.patch
 831.patch
+0009-Ignore-errors-during-lconvert.patch
-- 
2.30.2